[automerger skipped] Merge changes from topic "am-5f19bbb7c4ed4dfcbca495ed6c37b56c" into qt-qpr1-dev-plus-aosp
am: e58d0ed2f2 -s ours
am skip reason: change_id I528d3402cb047cca3793be5f1386c4bb60c39a10 with SHA1 01b1ad1d2f is in history

Change-Id: I9faf812c2946ef887dc5ccf011b2658b4acee4e5
tree: b32371e0b49324e03a7701ef675e45b2eb38f196
  1. service/
  2. PREUPLOAD.cfg