Android platform 14.0.0 release 5
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23816690'] into udc-release.

Change-Id: If946563d0e03bf63fbb94b0f1a91731c5cb42a63