Merge changes from topic "Fix for 65483665 (lmp-mr1-dev)" into lmp-mr1-dev am:...

Merge changes from topic "Fix for 65483665 (lmp-mr1-dev)" into lmp-mr1-dev am: a54aa363  -s ours am: 859ad76d  -s ours am: 0d22f58b  -s ours am: 75d21f33  -s ours am: 54c62e6b  -s ours am: 5748b778  -s ours am: 560028c7  -s ours
am: 771e69f1  -s ours

Change-Id: Ia75341ad2384b2aeed6c648ecabfa4bf7d2f5fdb