AOSP-JB4.3: Sync with CM

Change-Id: Ic8381ae08068546273e3cbeaf697ce67b03b238f