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

Change-Id: I6ab36dbcdcf3b093d1afcbadf909329ef53184e2