[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into nyc-dev am: 9ba8abb172 am: 0dc67034dd

Change-Id: I46eb3eda84faff6f49002504727142033e70314e