(Imported from upstream's 55abd566ea02cd21f7bff60db41f97bddad31496.) Change-Id: Ic48c3d2f6598cbf92ebda0f99e011647eb33f9f4 Reviewed-on: https://boringssl-review.googlesource.com/17104 Commit-Queue: David Benjamin <davidben@google.com> 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