Merge commit 'v3.0.8' into android-3.0