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

Change-Id: Ibee4cd36f6f40b94108e3bfeec99afd25265f4cd