Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177133', 'googleplex-android-review.googlesource.com/25177134', 'googleplex-android-review.googlesource.com/25064388', 'googleplex-android-review.googlesource.com/25169438', 'googleplex-android-review.googlesource.com/25180080'] into udc-qpr1-release.

Change-Id: Id38f208e19713c347fdd76b0f5fe49855995b0b5