Merge commit 'v3.0.30' into android-3.0