AOSP-JB4.3: Sync with CM

Change-Id: I6c782bb06efeb664ba29593cbefb9370e8de03ce