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

Change-Id: I65c69cd7eb0a263cadaeb02ce2d4e15bb0d0c176