Merge cherrypicks of [18674653] into mainline-conscrypt-release.

Change-Id: Ie7948f0f0f89584d96307e44d3ef09b895f86d90