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 am: 5748b7788c  -s ours am: 560028c736  -s ours am: 771e69f10d  -s ours am: 77f02787da  -s ours
am: 3c67b43de1  -s ours

Change-Id: Iacdd247687714a971509c51b1710ae86db1c7933