Merge "Upgrade 3.4 kernel images to ed3eea9"