AOSP-JB4.3: Sync with CM

Change-Id: If9418b973def4979751688802163a819ac71024c