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

Change-Id: I74674baf59179d09072ebe97615f6a482fd16e64