Merge "Update PushAPI authenticator to work with new Discovery API."