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

Change-Id: I8da5ab27f2c02cdbfe0869778bd231ae60f07637