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

Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db