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

Change-Id: If254f4838a22699fadc375e79ac55414ceee97a2