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

Change-Id: I622c9aa144ff20fd2522e96772d5f2e51ac8072d