Merge changes from topic "am-b4c20c17-d3c6-4a60-8bbc-1856c0a225e7" into nyc-mr2-dev
am: e0b71ace5f

Change-Id: Id7e74340bf5f2712afa31495921d4a72639ae521