Merge "Upgrade 3.10 kernel images to 1db7499"