AOSP-JB4.3: Sync with CM

Change-Id: Ia5339ec243d32e50c9bef9d6e0c7c68dc4553cc0