Merge "Remove unused Privacy Indicator strings"