Merge cherrypicks of ['googleplex-android-review.googlesource.com/26599512', 'googleplex-android-review.googlesource.com/26599513'] into security-aosp-udc-release.

Change-Id: I72982d3434ec7e526f4a04517a703391b113478e