Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177019', 'googleplex-android-review.googlesource.com/25069787', 'googleplex-android-review.googlesource.com/25176278'] into udc-qpr1-release.

Change-Id: I57dcbf0b3942451523291f5d793c643e5a4299cf