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

Change-Id: Ida7e07f2d981f3df794171aba9385dcc691f43c8