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

Change-Id: If011a468dafb3021b1ad6c87d3a5b3303b9163c5