CDB-1788 started to make gdrive code have shape. commit to change branch