Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102047',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102047', 'googleplex-android-review.googlesource.com/25043220', 'googleplex-android-review.googlesource.com/25381953', 'googleplex-android-review.googlesource.com/25410669', 'googleplex-android-review.googlesource.com/24709106', 'googleplex-android-review.googlesource.com/25202240'] into udc-qpr1-release.

Change-Id: I7aad5acf609f50009a158bcf30e240802cdcffe6