Android Platform 14.0.0 Release 2 (11103486)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24394995', 'googleplex-android-review.googlesource.com/24938084'] into udc-platform-release.

Change-Id: Ie5d88bd5d598ae67b7a2920961121d77dccc1f0c