Merge cherrypicks of ['googleplex-android-review.googlesource.com/34296694', 'googleplex-android-review.googlesource.com/34296695', 'googleplex-android-review.googlesource.com/34296696'] into udc-platform-release.

Change-Id: I4f621b07434f9237e6de7574fe6b2c6c1d9fec0a