Merge "DO NOT MERGE fix errorprone build" into qt-qpr1-dev