Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec
am: f9d05230df
am: 4f8be72b18
-s ours am: 2b8694c33d
am: 533c1efbc7
am: f5675a9ab0
am: 00143e1a7a
am: d68bd495ec
am: 1faf81da83
Change-Id: I506146a00ad79f7faad2888a0f1063a2a1c078d2
This commit is contained in: