Merge changes I704b2924,I14bfc166 into fp2-dev-v2

* changes:
  FP2-1374: FP2 OS Translations
  FP2-1431: Privacy Impact needs whitelist for CTS