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

Change-Id: I151f60719129726b86b7e16095e8f899ce74db57