Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a  -s ours am: b019e2c469
am: ce007d328d

Change-Id: Ic95aaeb03f2cd1d77f4c4e31967bd1d23c81738e