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

Change-Id: Ibeb1c29d07194732bf7f2494c3a3e988aa1cb524