Merge "DO NOT MERGE Add CTS for new permission check" into oc-dev