Path fix for appspot build
Merge branch 'hotfix/path_fix' into develop