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

Change-Id: I17df8df9288c0ec1c1bd68e10941dfe4e9d4e541