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

Change-Id: I6fea0fb2b86eae533971e4e0e2c0e835f8e4b5a2