Merge "Upgrade 3.10 kernel images to 302b154"