Merge cherrypicks of ['googleplex-android-review.googlesource.com/34304381', 'googleplex-android-review.googlesource.com/34389151', 'googleplex-android-review.googlesource.com/34888177', 'googleplex-android-review.googlesource.com/37180065', 'googleplex-android-review.googlesource.com/37662866'] into udc-platform-release. Change-Id: I98917021522a75c75ae25453d11e53c15857912c