Upstream changes to support Azure AD Production release