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

Change-Id: Ief980331cf8d8fab84f069243e92eed5b9f1fd19