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

Change-Id: I340ea45d56759ddacc4081d856a163a80d2ae9f9