[automerger] Merge changes from topic "am-8df6e69344e440f09140f067e6b62c52" into nyc-dev am: fa5fbd299e am: 06933f70bd am: 0157c3bc3c
am: 4e7f895f5d

Change-Id: I5afb96bb8ce6be263ad7352c510338d3db0ac023