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