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

Change-Id: Iced9c7bc063495c5b5009c29838a4a4b18a9d869