some changes for google cloud
Merge remote-tracking branch 'rt/master'