Merge cherrypicks of ['googleplex-android-review.googlesource.com/24596687', 'googleplex-android-review.googlesource.com/24603308'] into udc-d1-release.

Change-Id: I1e85f00918d38a958d1981a011114013b95f90da