Merge "Change privacy indicator holding policy" into sc-dev