Merge "Fix mock of setApplicationRestrictions()" into oc-dev