AOSP-JB4.3: Sync with CM

Change-Id: I49b51ff6767b98204895f39a2c4c98e2d908b26d