Yes I think this is correct. For years, MS has made apples-to-apples comparisons with AWS challenging by bundling in cloud app revenue into the overall Azure cloud business. Makes sense bc Office365 SaaS was so much larger than IAAS and PAAS.

O365 and on-prem enterprise suites are under Productivity and Business Processes