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

Change-Id: Ia92ddd808beafff9d375d6b7e400ed46ef204113