Merge "Update kernel to builds 7036823"