Merge cherrypicks of ['googleplex-android-review.googlesource.com/38251658', 'googleplex-android-review.googlesource.com/38427531'] into udc-platform-release. Change-Id: Ic15fe4c09f0b807a7efb896737f98071aba72fbe