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

Change-Id: Ic6d206ae7b2ee88616ef5b5b264a34c7d8fc691a