[automerger skipped] Merge changes I478f1d55,I39bb0916 into qt-qpr1-dev am: 383e326bf0 -s ours
am skip reason: Change-Id I478f1d558121e56e3d8bdeed4220eb8ba4ef097a with SHA-1 ee59f7184e is in history

Change-Id: I4f76c564249e17915a32d3ef5d13cee93112a461
tree: 53e21d87416646402dabecaab28b227f84aa7aec
  1. apex/
  2. service/
  3. PREUPLOAD.cfg