Update TrustedXFF to master

Change-Id: I0b3b7a7ff73f5b8ab6fc1052146d55691781bd7a