Merge cherrypicks of ['googleplex-android-review.googlesource.com/33648593', 'googleplex-android-review.googlesource.com/34264657'] into security-aosp-udc-release. Change-Id: I7b5726d0cb50d7a71affd78d8e07dabd48d88fee