Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev
am: a6d45d9768

Change-Id: Ib9fc2e1e447a16cd2226a7235fc40f1b4cdf3641