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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25027409', 'googleplex-android-review.googlesource.com/25165839', 'googleplex-android-review.googlesource.com/25224776', 'googleplex-android-review.googlesource.com/25246670', 'googleplex-android-review.googlesource.com/25097160', 'googleplex-android-review.googlesource.com/25272315', 'googleplex-android-review.googlesource.com/25253990', 'googleplex-android-review.googlesource.com/25235458', 'googleplex-android-review.googlesource.com/25291109', 'googleplex-android-review.googlesource.com/25373704'] into udc-qpr1-release.

Change-Id: I61c48eba58624dd4cd9bd15af71120164dd47abe