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

Change-Id: Ic50e8ea78358e3877153af4949b6b71dfd013af5