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

Change-Id: I7c4867b669e2dd5f811c9a75bc407d4334a8f812