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

Change-Id: I335ed4c90dff74f242b1a3270d233ce4609988f3