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

Change-Id: I774624727ee46180a96c8b19470f0f8078e6a8b8