Merge cherrypicks of ['googleplex-android-review.googlesource.com/25175717'] into udc-release. Change-Id: Icd87bd20667db9f86b207fbaa74c0955d14570de