Sync with AOSP 4.3