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

Change-Id: I6949d056310689a91ae0651a3235975b19db169e