Merge changes from topic "lmkd_async_msg" am: f802ecca30 am: b2df305e50

Change-Id: I9471d237340d5a9496a4a5f4401ede6f59432c46