Merge commit 'v3.0' into android-3.0