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