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

Change-Id: I8087523d9a9ac7a1e3a5e987f2d60915acb7d857