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

Change-Id: Id956ddcf9894f0b4305b680bba9d2d18f84e0b89