Merge "Add test coverage of PolicyControlComponent"