Merge branch 'master' into honeycomb-plus-aosp