Merge cherrypicks of ['googleplex-android-review.googlesource.com/27183334'] into security-aosp-udc-release. Change-Id: I5f41bf60869cdc42aab4c0e1ba9901bf8b9d3c2a