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