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