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

Change-Id: I2b0a4122f0c2d7ba3a93e94eccc4c1160125a497