Merge commit 'v3.0.58' into android-3.0