Merge 33355ec745ed0e9f0e1325d4c23670fcf375c19b on remote branch

Change-Id: I7ddfaa332e967c961af547e280f13f876dcb0694
tree: 545f5d93134d16d92c97fcd96ff331251ede8f23
  1. common/
  2. .gitignore
  3. PREUPLOAD.cfg