Merge "Revert "Remove TrustAgent whitelisting API""