Merge branch 'jellybean' into jb-bluetooth