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

Change-Id: I7ed8760e1cdd21928ac1669ee7539ec8f12432e4