Merge cherrypicks of ['googleplex-android-review.googlesource.com/25009816', 'googleplex-android-review.googlesource.com/25057592', 'googleplex-android-review.googlesource.com/25039491', 'googleplex-android-review.googlesource.com/25058689'] into udc-qpr1-release.

Change-Id: I33a526eef1d6aea92378a9cb954d7fcc7555d6ae