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

Change-Id: I3a7250d38f87672dbb3e3c025e8c2a56606d738b