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

Change-Id: I63f8a0d60e05c2ae57d3ef2404bb4f21fd386767