changes for Google Authorization process during file selection
merging changes