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

Change-Id: I64079057c20c568597db0f9890121a8ae515754b