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

Change-Id: I8d8e685f0c879b7def7400e6bf655f8732d50290