AOSP-JB4.3: Sync with CM

Change-Id: I6e8876ebb9410a99c5174c6962a8a1c4128e8ab0