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

Change-Id: I50f1aaef9f31cd7172c2aa209d30462803dad336