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

Change-Id: Idaef3b60adefee9e4162612242df92f3ce2901e0