Merge commit 'v3.4-rc7' into android-3.4