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

Change-Id: Id23cf76973224c771883eb1abb38191fc52d679b