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

Change-Id: I0f1610be06f2bce926873cff92410ce1843e308b