AOSP-JB4.3: Sync with CM

Change-Id: I9be66064ed6375ff290d32dc9e0768770346b11b