Merge changes from topic "lmkd_async_msg"
am: f802ecca30

Change-Id: I105214f7157b680bce028b12a8f437505907a535