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

Change-Id: Ic99a855892c7d2fe6367e2bafa7d87f1ccccf1d7