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

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