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