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

Change-Id: I943eb4abfdd5dd1b6ecefd64e8c26a0cf9ca969b