Merge "Upgrade 3.10 kernel images to f185e20"