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

Change-Id: I8125e399443130765936745d62f656a27e7aa7c3