AOSP-JB4.3: Sync with CM

Change-Id: I9ecd1374abc32f43807a9d16e80088965ba70d23