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

Change-Id: I7454a92ec719ff1b3d3a6e7ed0b7e21ea93ea331