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

Change-Id: I853c049eee96bb6b06cdc98f540e779761e946f3