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