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

Change-Id: I2e50c6ff1d93335178aa88bca080d5d80511f0b7