Merge "Update services info before returning authenticators" into nyc-dr1-dev