Merge "Rename references to Permission5" into udc-dev