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

Change-Id: Ia3fe47c569761f5b25698e56dea687b269496011