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

Change-Id: I13498717ea42becd292db5e949317a94377cdb30