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

Change-Id: I6ec117bcd920a42b09237409c4d50feb18b0c55f