Merge "Update for 5.11 kernel update."