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

Change-Id: I1a9106d1de7582f46cc788d8f66c5d6493ec2bd1