AOSP-JB4.3: Sync With CM

Change-Id: Ifa542854af9c840e60ee16e55b4eaa145f0d553c