Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into nyc-dr1-dev
am: e9bfcf0dba

Change-Id: Idc67edcfe892f51d62c2cbd8860c1ecfedae9663