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

Change-Id: I08f239f376816772d050c6ca4d61b5d4e4a63a61