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

Change-Id: Ie57cec36a378fa7fa7bb7c79b00adda562a9a1f1