Merge "Merge "Ensure the content provider helper is exempted" into pie-cts-dev am: 5ad5807872"