Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into nyc-mr1-dev am: 541979d825
am: 38e3c9319a

Change-Id: Ic4d48c3ad03d90d7a367ee414a4430e9cb113ba0