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

Change-Id: I0203787fa7a43e39579f79a0feafb64ff12ebabb