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

Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9