Merge changes from topic "boringssl-kmsg" am: 993d07fc53 am: 51d8b8bf9d am: 5c83dceb52
am: 7caca4a67d

Change-Id: I8976545a94af87ce7fa681e24aee017899cc1227