Merge "Add @ResourceInt annotations on APIs"