Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
am: 54e508ca63
am: 4fc6cbfa6a
-s ours am: b019e2c469
am: 072d4c282e
Change-Id: If13f37325685c98d796e24334f00e5ae9bc9a3b8
This commit is contained in: