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