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

Change-Id: I655137405a196e1ae3a64a3cf6dda48f2d15704d