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