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