Android 4.1 preview 1
merge in jb-release history after reset to master