Add changes for AOSP 4.3