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

Change-Id: I64ed07901f67140d56cf289d5099119a1c80f76f