Merge commit 'v3.4' into android-3.4