Merge "Simplify distribution-check to use -Pq profile"