Merge "Reporting API and Feature Policy reporting support"