Heads Up :
The post you are writing will appear in a public forum. Please ensure all content is appropriate for public consumption. Review the employee guidelines for the community here.
I also got this error while having custom NAP policy in subdomain. It is not related only to global domain. After deleting the NAP from sudobmain, the upgrade was successful.