Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
This commit is contained in: