Merge "Remove extra uapi from include."