Merge cherrypicks of ['googleplex-android-review.googlesource.com/35164123', 'googleplex-android-review.googlesource.com/35708253', 'googleplex-android-review.googlesource.com/36005284'] into udc-platform-release.

Change-Id: I0a0e7be8d048d3c9e716843d18f1788a66559451