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

Change-Id: I391f6d7c302d3fa4ad97c8c558133c84ea366685