Merge commit 'v3.0.1' into android-3.0