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

Change-Id: I945ccfa284651c5d2311b20e4cff58d5e2b47e0e