Merge cherrypicks of ['googleplex-android-review.googlesource.com/25235371'] into udc-qpr1-release. Change-Id: Iac6c8393cf3e0cef96b6c38d5c78c0f864feeafc