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

Change-Id: Ia2a8552ec6a324a32bfa3832c0cd9ccb22d67c67