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

Change-Id: I6771ff2603b6dd180543857d8f2a17bf13cf9861