DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: e0ea57db49

Change-Id: I3536bdf1978d603a20346ec3065232f3af374f59
tree: 232eb3ec2c4a2fd5dde62f97fd5c9f419f9747d3
  1. service/
  2. PREUPLOAD.cfg