Merge "Update kernel input headers"