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

Change-Id: Ic9fe362b86f30ccaa936b64335d65c5fe859c9bf