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

Change-Id: I6467407d5d49cc120e53b798e3772dfd0a0d8851