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

Change-Id: I294620bb34d39443580947141bb917ead11c735c