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

Change-Id: If666cdb52e2565e889fd026917eaea20502ca59e