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

Change-Id: If20455e569194ae05609258a737cd8a069455e76