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