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

Change-Id: Ibf4a1bac4d46a4a1e6cea5060efa05b4ed309368