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

Change-Id: Ic81d41c7382ca66c4c9a9e929de8bd90fb29de6f