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

Change-Id: I38e3ca68898b250c83088281f7676740e1dacffe