Merge "Hide setPolicyDataEnabled" into rvc-dev