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

Change-Id: If8d4d73c7117270265d72c687b7176f24d84afff