Merge recent commits from ics to jellybean