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

Change-Id: Ide78e508d46fdd6ef883b1fb541ad8a86a1bf25c