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