Merge master@5406228 into git_qt-dev-plus-aosp.
am: 8f46588430

Change-Id: I2d4c3f560628857493b24c09e12b51fb869b56d5
tree: dfc8c845da43a73f47efa457bc3f06ad479d9e6f
  1. service/
  2. PREUPLOAD.cfg