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

Change-Id: I62d685c3bfba7897e8753359e1a3d644c068c40c