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

Change-Id: I2a7f963e308022fc2d29093bdff2eb1f0990312f