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