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

Change-Id: Ib52668491e63fb4319897dedf72db7f43bbfb106