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

Change-Id: I54a6b20c1fa844649026fc6987487ae23012ebca