Merge cherrypicks of ['googleplex-android-review.googlesource.com/36774913', 'googleplex-android-review.googlesource.com/36774914', 'googleplex-android-review.googlesource.com/36774915'] into udc-platform-release.

Change-Id: I4f91629156152f2e3cf8a8a87514215c5c767909