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

Change-Id: I49cdc918a290d35d619bda76f0c7c8e20538bfe7