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

Change-Id: Ib8beb3f983423172b01441658e30a4f21adade0c