fixed policy: use TOA + discovery server name

Change-Id: I794e3e31791599610fce9fd2861fdbe367609a29
Merge "fixed policy: use TOA + discovery server name" into R1.10