[automerger skipped] Merge changes from topic "lmkd_async_msg" am: f802ecca30 am: b2df305e50 am: 204c388017 -s ours
am skip reason: Change-Id If183c177bb32bad18373dfcd8434e48313935a4c with SHA-1 4fcb2a173f is in history

Change-Id: I74e0cbd02173ed494e6c61eadf4ecc6ece7d25c1