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