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

Change-Id: Id38ae83c7c2c24deb8eef89e631ceb193326f5ca