AOSP-JB4.3: Sync with CM

Change-Id: Ie94c778d14b533d4ce7e70b4606828ab3eb070f6