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

Change-Id: I6b4ad117155e876daf81df0d93cad19dab9ef126