Merge "Fix Trust Agent discovery for FBE" into nyc-dev
am: 957df516f0

* commit '957df516f006129198847ff9448004c097e1be98':
  Fix Trust Agent discovery for FBE

Change-Id: I51cfea9ab91950fea7f0e599a4300b4ac42d5849