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

Change-Id: I2d906d4ac87deb6b1acd4310ed9a9b3cb3cfb99a