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