Merge changes from topic "boringssl-kmsg" am: 993d07fc53
am: 51d8b8bf9d

Change-Id: Iba30c9cc59ac988d1f6acbbd4b9fbfbc6e73ea6d