Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev
am: 9ba8abb172

Change-Id: I8b790233be9ebcdf4a6e0347a5d84fda69e86f57