[automerger] Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev am: 3815133611 am: 633566e2b7

Change-Id: Ic48b2a40ed04bb6403021c378fb3daccad73e9c3