Merge "Add a config updater component for the intent firewall" into jb-mr2-dev