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

Change-Id: Iaa62307f23e3f8ca5576cc330dc224113e5a5547