Add changes for AOSP 4.2.2