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

Change-Id: I6f6de560c3dfcdb84d03f6014ccc12fa9a30af03