Merge "Update kernel to builds 8019225"