Merge changes I1fc3b301,Ib42ab29e into qt-dev

* changes:
  Update boot image and system server profiles
  Update boot image and system server profiles