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