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

Change-Id: I1e9b1270def451f41fb553708d0cc50ecafc6fdf