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

Change-Id: I6db727e998bb0f2c15182ba745cca43194114a44