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