Merge changes from topic "base_cmsg" am: 8954d0bc98 Change-Id: If51ace5232566f43430a5fb31708a6b20fc4aba1 Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core Cr-Mirrored-Commit: b1ca42ae281b44e4fc5eae0e87e01dfd762a4f37