Merge cherrypicks of ['googleplex-android-review.googlesource.com/23764855', 'googleplex-android-review.googlesource.com/23916075'] into udc-release.

Change-Id: I2ad4dc881a4f3f04709d24f7a809c9e2d94e41df