Merge "Make VDM APIs and permission annotations consistent" into main