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

Change-Id: Ic05387293b73f13a24e7c37b7bbd696a5026980b