Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
am: 5d3967338d
am: 57aa22c671
Change-Id: Ia487b2e3c0ee6c4eace1502704fda873e3690300
This commit is contained in: