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

Change-Id: If6cf74f0b0750b53d11c2e808d82c6fa576d04b5