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

Change-Id: I306ef5632f243ed6b29d093101a7808549fe37fd