Merge "Merge "Remove test image" into qt-r1-dev am: 575149f8f0 am: 0c2b98740d" into qt-qpr1-dev-plus-aosp