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

Change-Id: I471ed63a1cd1c6501617ed6be90950a610cd3dcd