Manifest update after merging with oc-dev - DO NOT MERGE

BUG:64031950
Change-Id: I3fa634c45314bdbd64fcd27404676dc415ac2efc
1 file changed
tree: 6137ebbec9ca854b99866dab12568189089498a3
  1. GLOBAL-PREUPLOAD.cfg
  2. default.xml