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

Change-Id: I71b8f9eb54de40db3e5f2f7ced6c44d1d817e75d