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

Change-Id: I936fd8c441ed20e6616f00c603d22c4551923f27