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

Change-Id: I89635be6d5f768bd4780dd1b6daeb30e9cbab4d2