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