Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b
am: c84dc8feb3
am: 4b029f8b0d
am: 4c70016a94
am: 46592e90a9
am: 55b3b1f349
am: af26bae8b3
am: a1426f209c
am: 2e690de9cf
am: 7a7d6b1d0c
Change-Id: I7a12d05b79c4a78e14fccf5288c9bea50ae4c4d9
This commit is contained in: