Bug 926343 - Part 7: Use default clientId in PushService