Merge cherrypicks of ['googleplex-android-review.googlesource.com/25159378'] into udc-qpr1-release.

Change-Id: I85f3aed1536fcb97785f040aca47e3f837165850