Merge changes from topic "Fix for 65483665 (lmp-mr1-dev)" into lmp-mr1-dev am: a54aa363c8  -s ours am: 859ad76dc9  -s ours am: 0d22f58bee  -s ours am: 75d21f33d8  -s ours
am: 54c62e6bec  -s ours

Change-Id: Ie22112e7c84ac28bf5fe5b51cd1a592bf7e395f4