AOSP-JB4.3: Sync with CM

Change-Id: Id12cf1d4c7770e5098977d3373bf585f9e7285be