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

Change-Id: Ieee68e63532afa8eb6fb68258ed93fe3d8c70e45