Merge "Updating aliases for Permission related ownership"