Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3
am: 4b029f8b0d

Change-Id: Ibedf70b6b6b14d51ba482f28f2db9c04c10457d6