Battery-swapping design norms to be voluntary, policy to be out this month