Merge "Add back enforceReadPermission for getmetadata" into pi-dev