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

Change-Id: Id171378b87ac09f200a50ff776c6974a041d0e8f