Android 4.3 release 3.0
am be482d96: (-s ours) am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'be482d966527bf6894e23533afbe7d586c7f0f34':