Merge "Update kernel to builds 8001942"