Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into nyc-mr1-dev
am: b3e7954a67

Change-Id: I18b231e781e0f71058b2f812ef7e95d091e68b7a