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

Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7