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

Change-Id: I34db45d603e77ffc3eefc9290cbcfa15668ed1f3