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

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