Merge changes from topic "Fix for 65483665 (lmp-mr1-dev)" into lmp-mr1-dev am: a54aa363c8  -s ours
am: 859ad76dc9  -s ours

Change-Id: I4a6fcc692b4e1e7053606d81c4315519aff07979