Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec

Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c