Merge "Remove system approved from cts." into oc-dev