Merge "Update kernel to builds 7166325"