Merge "jewel: squashed commits from CM" into jellybean