Merging from ab/5068661
am: 437863b3da

Change-Id: I34070b277d02d36ce02a758d8d7dc02c0cb4a2f5
tree: ff28f39df920171b34720491766d99e50f1e572c
  1. GLOBAL-PREUPLOAD.cfg
  2. default.xml