Merge cherrypicks of ['googleplex-android-review.googlesource.com/25176955', 'googleplex-android-review.googlesource.com/25063890', 'googleplex-android-review.googlesource.com/25181894'] into udc-qpr1-release.

Change-Id: I723e6b90de0086e165cef0e5f7ca0fe202bc0e61