Merge "Use -Pq profile instead of -DskipTests=true"