Back-port ag/2491664 am: 1d21738bd6
am: 4150739791
-s ours am: 9d889600a9
am: f6b1267780
am: 5d3967338d
am: 57aa22c671
am: 91f4a42dac
am: ba26fabe3e
am: 85aa9ccc69
am: 2e2e6fcc04
am: 625d4bffc7
am: 066f79adc3
am: e8f916bf97
am: 702d130b13
Change-Id: I385c7679197c6ac29910fdc15d911df682a950c1
This commit is contained in: