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

Change-Id: I36ced289919656cd5d76f595f53728a02761e479