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

Change-Id: I571ba964f07eccdb149c92d036cb895499145a43