Merge cherrypicks of ['googleplex-android-review.googlesource.com/24060456'] into udc-release.

Change-Id: Ib62cd5af6d42a792b593a21fa094727717f21f73