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

Change-Id: I5a45e85ba4dbd6d4239c1317868960a3267599c6