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

Change-Id: I0fa4d34488cab6df7f553d97a5a70b7050e2d287