Merge "Upgrade 3.10 kernel images to 6cf40d0"