Merge cherrypicks of ['googleplex-android-review.googlesource.com/24366176'] into udc-platform-release. Change-Id: Ic232fe3d847001f9f3dee5af9646626b2fe58ba7