Closes #2065 Change-Id: I091aac6e81dc497668671427267d0ef2321ae8af (cherry picked from commit 4c8e2262be)
4c8e2262be