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

Change-Id: I0b78bc04741d8b0d2d7af292484a025d0c62fd6a