Merge commit 'v3.0-rc7' into android-3.0