Merge "Add Cts for privacy indicators to TEST_MAPPING" into sc-dev