Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours am: 2b8694c33d
am: 533c1efbc7

Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33