Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into nyc-mr1-dev
am: 7591071f2c

Change-Id: I245f9d476ec531c1aa064bf9bd2c72c2888ea625