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

Change-Id: I71360e095484cf31371d98be75f84bb4b244ef12
tree: 81a4836cdc524351be9ba3a57e620505be5163d1
  1. service/
  2. PREUPLOAD.cfg