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

Change-Id: Ie23e909d0a96a5ff8b5a9e27512f351217143eac