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

Change-Id: I95aa412212645226f6ed7498a0d849c023a78124