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

Change-Id: I6720ab5d1c8bf757bf29a202e5c60a7fb6ad7142