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

Change-Id: Id4331dd23183d4c3f1a3b448060fc6a14098d3d1