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

Change-Id: I3b4fe4be0b803e5df45b5cd7e0cfedea88259eac