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

Change-Id: Ida6b225296d30f12316d5de86e63d2716cead600