Merge "Fix PolicyControlComponent"