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

Change-Id: Ica994201185611747baafb97a0da165c5fa5960c