Merge cherrypicks of ['googleplex-android-review.googlesource.com/29050559', 'googleplex-android-review.googlesource.com/29050560'] into security-aosp-udc-release. Change-Id: Idd15023694b2433953e7168f46f67f484f6999f8