Merge "Fix ClientMode initialization order" into qt-dev am: ba010985e6 am: c956a8c169
am: 153483fa65

Change-Id: I5f65fea66897cc5fa351d3647be26f466ac99724
tree: 7e7e9f6b7eb977cfcff2765486c74e982856d2ed
  1. service/
  2. PREUPLOAD.cfg