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

Change-Id: I58216427d0c73683114b79239ae3d30dd729f419