Merge cherrypicks of ['googleplex-android-review.googlesource.com/25815993', 'googleplex-android-review.googlesource.com/25815448'] into udc-d2-release.

Change-Id: I731687bfa5057274688dd372640b8c463d5ccb7b