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

Change-Id: I171c52f5da15da26e28c83d312864aa25c22bee2