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

Change-Id: I074b6e0452cc7957371478f92799ed7c777c7262