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

Change-Id: I10c3e36994637d241a0b4ed6acf4833d44c43d10