(Imported from upstream's 753316232243ccbf86b96c1c51ffcb41651d9ad5.) Just to sync up a bit further. Change-Id: I805150d0f0c10d68648fae83603b0d46231ae4ec Reviewed-on: https://boringssl-review.googlesource.com/27685 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>kris/onging/CECPQ3_patch15