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

Change-Id: I5d955c5d595f5b0e4a84f481bdc1caa1883e862a