Merge changes from topic "am-52c9abb0d1fd4daca81c086c4b14b541" into nyc-dev
am: 3815133611

Change-Id: I666c25a5396ebe2ed71832afe035f4b75b258c10