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

Change-Id: I3d9d1e7b00587ae677b88446725275e683d2a23b