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

Change-Id: I0f1e37e71db1d45804bb806df564bf496a320ec8