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

Change-Id: I1ba0b3f6fb4038dc836e0bc0abb7b199f76fce36