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