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

Change-Id: I2b467d7375d6f4b652159d9dd3b0769d27a6e2a8