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

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