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

Change-Id: Ibeb276f08bd8d6fdd25dc705bba3224ab0b72c58