Merge cherrypicks of ['googleplex-android-review.googlesource.com/36017794', 'googleplex-android-review.googlesource.com/36999444'] into security-aosp-udc-release. Change-Id: I9a3943e39331f124690d57f8ae26e6747d6334cc