Merge "When profiles are requested, also generate then for non-prebuild."