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

Change-Id: If1f3ad96c5c2f7a862232fa30399cf0ede9c72bb