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

Change-Id: Idcf1e4c591f6ef64a0c0ad7ff035d592b91cf185