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

Change-Id: I8c04721f78c427269cb7821050eb1b6ce814cd63