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

Change-Id: I54562890277077d952df4ef24f0372bc00c43e5a