Merge "Fix ClientMode initialization order" into qt-dev am: ba010985e6 am: 59bf306fc8
am: fa8fd8915d

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