'merge android-4.3_r2.2 into jellybean3'