Merge "Back-port ag/2491664" into nyc-dev am: 3adf585961
-s ours am: 6fee9a5e91
am: ade8640d4d
am: 57f1af6a0b
Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999
This commit is contained in: