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