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

Change-Id: I08f6fef2878b48dd06e472993fcd3f19c614c8e6