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

Change-Id: Ie5b0cfb5f4b424530fd566637ddc4d396e9339c0