Merge "update 3.4 kernel from commit fb3ea4fef3826fdcea5df2e9918d6e221d66bea7"