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

Change-Id: I2aa520605bda044d4452cbd68334fb79d0fa5a25