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

Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2