Merge cherrypicks of ['googleplex-android-review.googlesource.com/25150779'] into udc-qpr1-release.

Change-Id: Ie64c92ae5bd014932c746f338b601354b72da8e4