AOSP-JB4.3: Sync with CM

Change-Id: I559c44dd530da72f8696eda6ea64559baf0c69b8