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

Change-Id: I98725b8551fd1502d4cdb7a37e937fd424f4cd97