Fix incorrect comment description
Update google::calculator since the api is no longer accessible.
Merge remote-tracking branch 'origin/sophia-3.0' into sophia-3.0