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

Change-Id: Ie6854b289d097ced0d87222fbeb6c361324b92a9