Merge "AgpsManager supports two clients"