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

Change-Id: I7ecc9c0925cdfb815b974341ab7b850f27b6a556