Merge cherrypicks of ['googleplex-android-review.googlesource.com/25815580', 'googleplex-android-review.googlesource.com/25815747'] into udc-d2-release. Change-Id: I037da525899b089b2e4e393e9e1206ef3d5ce2c9