Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8-lmp-mr1-dev" into cw-f-dev am: f65408d260 am: 21e741971b
am: fc3bbd55b1

Change-Id: I2b647099f6c51d088a652617ac7838e38b090e67