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

Change-Id: I4662c0a28d6c6d5703dbcfe687a9ac990455d660